From: Kenichi Handa <handa@m17n.org>
Date: Wed, 2 Feb 2011 02:16:53 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~18^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2e12d747c6eab0ea5b0886b1f694e601dabeb00f;p=emacs.git

merge emacs-23
---

2e12d747c6eab0ea5b0886b1f694e601dabeb00f
diff --cc src/ChangeLog
index d50d3e61bc0,6cbc624e914..95c702fecd3
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2011-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +	* ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
 +
 +	* xftfont.c (xftfont_open): Likewise.
 +
+ 2011-02-01  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* window.c (Fselect_window): Add missing return value.
+ 
  2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
  
  	* image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead